build: Don't use shopt in the build command
authorTing-Wei Lan <lantw@src.gnome.org>
Wed, 18 Feb 2015 16:16:15 +0000 (00:16 +0800)
committerTing-Wei Lan <lantw@src.gnome.org>
Wed, 18 Feb 2015 17:27:44 +0000 (01:27 +0800)
shopt command only works in bash, so we should not use it in gtk/Makefile.am.

https://bugzilla.gnome.org/show_bug.cgi?id=743647

gtk/Makefile.am

index 721a76d5a25b064b2634965679373f53c30a3846..67d853368852424498104d95edd949ebd9994fa7 100644 (file)
@@ -1158,10 +1158,10 @@ gtk.gresource.xml: Makefile.am
          n=`basename $$f`; \
          echo "    <file compressed='true'>ui/$$n</file>" >> $@; \
        done; \
-       shopt -s nullglob; \
        for s in 16x16 22x22 24x24 32x32 48x48; do \
          for c in actions status; do \
            for f in $(srcdir)/icons/$$s/$$c/*.png; do \
+             test "$$f" = "$(srcdir)/icons/$$s/$$c/*.png" && continue; \
              n=`basename $$f`; \
              echo "    <file>icons/$$s/$$c/$$n</file>" >> $@; \
            done; \